Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#1240 backports for v2 #1275

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open

#1240 backports for v2 #1275

wants to merge 40 commits into from

Conversation

bertsky
Copy link
Collaborator

@bertsky bertsky commented Sep 24, 2024

As discussed this is basically a cherry-picked version of #1240 with just the fixes (and some minor additions to get tests running smoothly again).

Changelog must also be cherry-picked from, but that's completely manual and can be done after review.

Most importantly, this solves the problems with Pillow 10.

bertsky and others added 30 commits September 24, 2024 22:19
@bertsky
processor CLI: delegate --resolve-resource, too
5663f48
@bertsky
test_mets_server: fix arg vs kwarg
853bdb5
@bertsky
mets_server: ClientSideOcrdMets needs OcrdMets-like kwargs (without d…
33c7386 
…eprecation)
@bertsky
use up-to-date kwargs (avoiding old deprecations)
37f7cda
@bertsky
hide/test expected deprecation warnings
44946ba
@bertsky
improve output in case of assertion failures
d0962d6
@kba @bertsky
allow "from ocrd_models import OcrdPage
061f023
@bertsky
ocrd_utils: forgot to export scale_coordinates at toplvl
d2f92d1
@bertsky
fix imports
c6c5c42
@bertsky
Processor.zip_input_files: warning instead of exception for missing i…
245778c 
…nput files
@bertsky @kba
Processor.zip_input_files: more verbose log msg
1f7b57f 
Co-authored-by: Konstantin Baierer <kba@users.noreply.github.com>
@bertsky
tests report.is_valid: improve output on failure
35bdb39
@bertsky
fix --log-filename (6fc6060): apply in ocrd_cli_wrap_processor
e595996
@bertsky
fix exception
f21b8d2
@bertsky
adapt to PIL.Image moved constants
0cbd3ea
@bertsky
cli.workspace: pass fileGrp as well, improve description
8f8912c
@bertsky
OcrdMets.add_agent: does not have positional args
6dccfb3
@bertsky
update pylintrc
2d85f14
@bertsky
pylint: try ignoring generateds (again)
ea68370
@bertsky
ClientSideOcrdMets: use same logger name prefix as server
18ac2c0
@bertsky
test_mets_server: use tmpdir to avoid side effects between suites
da37967
@bertsky
disableLogging: re-instate root logger, to
ccb416b
@bertsky
test-logging: also remove ocrd.log from tempdir
7e3cdf4
@bertsky
bashlib: re-add --log-filename, implement as stderr redirect
4f45b12
@bertsky
ocrd_utils.config: add reset_defaults()
7b70c90
@bertsky
add test for OcrdEnvConfig.reset_defaults()
48bb3c2
@bertsky
Workspace.reload_mets: fix for METS server case
ed92403
@bertsky
OcrdMetsServer.add_file: pass on 'force' kwarg, too
9c3c399
@bertsky
test_mets_server: add test for force (overwrite)
c077e95
@bertsky
PcGts.Page.id / make_xml_id: replace '/' with '_'
4492168
@bertsky bertsky requested a review from kba September 24, 2024 23:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kba kba Awaiting requested review from kba

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bertsky @kba